Merge "Fix virtual displays for HWC 1.0" into klp-dev