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

Change-Id: Ifdf0b51c2511c13313dcd29f991f7a371b72464e