Merge "Attempts to fix InputChannel not initialized crash." into udc-dev