Merge "Fix bug where all apps didn't load sometimes" into ics-mr1