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

Change-Id: I51c696280b4fd322cde7f4701bbf6b0042a7ab3e