Merge "More improvements to the display manager." into jb-mr1-dev