Merge \\"HWC2: Fix virtual displays\\" into nyc-mr1-dev am: d47c07fe33
am: 8abbfbcd69

Change-Id: I62e9ae529c6c9bacaf89ae6ee40e21656ca09933