Merge "Make sure onScreenTurnedOn is called at power on." into jb-dev