Merge "Update ownership for UidObserver related classes." into main