Merge "Uses SurfacePackage instead of SurfaceControl on inline suggestion" into rvc-dev