Merge "Handle integer overflow in BaseInputConnection" into udc-dev