am 513b8ea1: am 3f1246a2: Merge "Coordinate screen on with the window manager." into jb-mr1-dev

* commit '513b8ea16fdedd7b6debd718798c0220edd61d7f':
  Coordinate screen on with the window manager.