am 80d26ac0: Reconcile with ics-mr1-release

* commit '80d26ac02b666d8092995f42156ebc05359705f8':
  Fix bug where all apps didn't load sometimes