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