Merge "Use dispatchAll to reduce the flakiness" into udc-dev