Merge "Fix CtsSurfaceControlTestsStaging for 90Hz devices" into main