Merge "Handle idle->loaded state transition when loaded->idle is still in progress" into nyc-mr1-dev