Merge "DO NOT MERGE: SurfaceControlViewHost: Restrict disclosure of input token" into sc-v2-dev