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

Change-Id: Ie42e4acc1144e2f3517ef5302c7cbcc004223224