Merge "Add null checking in onUidRemovedLocked"