Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev