Merge "HWC2: Skip validate/present if display is off" into nyc-mr1-dev