Merge "SurfaceControlViewHost: Allow updating of WindowContext used for SCVH" into tm-dev