Merge \\"Revert \\"Add state for loading/unloading apps\\"\\" into nyc-mr1-dev am: 0aee1b4163
am: c1262d4505

Change-Id: Ica31492eb5cb8839483854f9ca075b39756759be