Merge "Fix clobbered RemoteInputView when changing position" into nyc-dev