Merge "HWC2: Modify multidisplay for null display mode"