Merge "Revert "SurfaceControlViewHost: Restrict disclosure of input token""