Merge "Fix flaky InputSurfacesTest tests" into main