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

Change-Id: I2a547b679f8027ff635f27593d85bac80fafeae2