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

Change-Id: I49333eb66bf8846e370b94b3c0c10c72664b5b2b