Merge "Uses SurfacePackage instead of SurfaceControl on inline suggestion" into rvc-dev am: 78160dc4 am: 3878dd4d Change-Id: I55ef0bb19731d5526f450c195241a784adc5f9ea