am 42a6516d: am 89c6bec3: Merge "Make sure onScreenTurnedOn is called at power on." into jb-dev

* commit '42a6516de996b547ecbfc53fd7e101f2b8b6c490':
  Make sure onScreenTurnedOn is called at power on.