Merge "Initial draft of high-level multi-display APIs." into jb-mr1-dev