Merge "Use GC critical section for adding and removing app images" am: b2b6d8a778
am: 78b636be0a

* commit '78b636be0a04173707ba3ea3ef5384a6f48b0e10':
  Use GC critical section for adding and removing app images