Merge "Fix crash in recent apps" into ics-factoryrom