Merge "Disable/ignore CtsSurfaceControlTestsStaging" into main