Merge "Fix virtual displays for HWC<=1.1" into jb-mr2-dev