Merge "Only set appToken.setCanTurnScreenOn to false if screen was turned on." into pi-dev