Merge "Add initial multi-display support." into jb-mr1-dev