am 99c82587: Merge "Use new display manager API." into jb-mr1-dev

* commit '99c82587b170497eeb8518db79beba8625038019':
  Use new display manager API.