Merge "Uses SurfacePackage instead of SurfaceControl on inline suggestion" into rvc-dev am: 78160dc4 am: 420a319f Change-Id: I2c3acc502c547cde785ee4f89ae6abcfbfc661f5