Merge "Fix remote input view clobbering" into nyc-dev