Merge "Revert "Add state for loading/unloading apps"" into nyc-mr1-dev