Merge "Allow creating ASurfaceControl from NativeActivity Surface" into main