Merge "Make SimpleSurfaceGLActivity fit system window insets" into main