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