Merge "[automerger skipped] Merge "Fix persistent dot not removed due to race condition in scheduler" into udc-dev am: 31a8777cbc am: eeee7e97cb -s ours" into main