Handle idle->loaded state transition when loaded->idle is still in progress am: c5e316d4ef am: fd3ca8acd4
am: e1e7a5a1e2

Change-Id: Iccb6a413f3688c74fdcb6b8cc437428aa36bb909