Merge "Merge "[pm] fix crash caused by race condition onUidGone" into udc-dev am: a3aa00e2 am: 84c74bd5"