Merge "Fix PullUidProvider unregistering on config update" into rvc-dev