Merge "Fix 5454202: make the UI work even if there is no goofy face effect." into ics-mr0