Merge "Handle race between UID state and activty resume" into pi-dev am: 63a0662d03
am: 836574767a

Change-Id: Ifec2902129f7bd688eaf644ad88607995cb611ec