Merge "Explicitly take app out of app idle state after turning battery on." into main