Merge "Try to avoid the timing UI issue" into udc-dev