Merge "Small step towards supporting multiple displays" into jb-mr1-dev