Merge "Revert "InputConnectionWrapper never supports null target."" into nyc-dev