Merge "Rename WindowlessViewRoot to SurfaceControlViewHost and rework API"