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

* commit '3f1246a29b58cf78ebe674ec0905ad1795027aac':
  Coordinate screen on with the window manager.