Merge "IME Support for SurfaceControlViewHost" into tm-dev