Merge "hwc2: Skip validation fixes"