Merge "[Ongoing Call] Always unregister the UidObserver." into sc-dev