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

Change-Id: I53508213aec32c36e59e7d37a88de7ca52aea924