Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev