am 4ed61b22: Merge "Move virtual displays out of HWC 1.2, mark experimental" into jb-mr2-dev

* commit '4ed61b22e046ed544f6afb50abd0af25d478d8b1':
  Move virtual displays out of HWC 1.2, mark experimental