Merge "Uses SurfacePackage instead of SurfaceControl on inline suggestion" into rvc-dev am: 78160dc4c0

Change-Id: I495a191e64336967e1e55e3f5bfa57b5179dfb2e