Merge "Don't return early if searching during rebindAdapters()." into udc-dev