Merge "Fix setCanTurnScreenOn for a launching activity"