Merge "HWC2: Fix virtual displays" into nyc-mr1-dev