Merge "Fix contrast enforcement for RemoteInputView" into nyc-dev