Merge "Add features to DisplayManager." into jb-mr1-dev