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

Change-Id: I45180aef6beb339b8858f1256f388270a27eb2d6