Merge "[pm] do not send UID_REMOVED broadcast if shared uid still exists" into main