Merge "Coordinate screen on with the window manager." into jb-mr1-dev