Merge "Fix b/318722891 (unwanted onSurfaceCreated event)" into main