Merge "Decouple turning screen on from waking up in policy." into lmp-dev