Merge "Use new display manager API." into jb-mr1-dev