Merge "Prevent dismissal on RemoteInputView" into nyc-dev