Merge "Revert "Minimal changes to support multi-display HWC"" into jb-mr1-dev