Merge "Make sure late connected non ui ICS are unbound." into udc-dev