Merge "Refactor DisplayManagerService to be functional." into jb-mr1-dev