Merge \"Add state for loading/unloading apps\" into nyc-mr1-dev
am: 2e42020eab

Change-Id: Ie2899e0eb301fd33ca2546fe854a5109a24906b2