Merge "Fix race condition in UidRecord cleanup" into rvc-d1-dev