Merge "Opt out HardwareTestCases from display compat" into main