Merge "Reduce SurfaceControl feature gap to NDK API"