Merge "Use unique names for InputSurface in e2eNativeInputTest" into main