Merge "Defer sleeping / waking the device on device state changes."