Merge "Reset mCurrentLaunchCanTurnScreenOn state after new Activity launched" into main