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

Change-Id: I0df53741a24eb65d56060651c11f0417d608399e