Merge "Fix persistent dot not removed due to race condition in scheduler" into udc-dev