Merge "Handle race between UID state and activty resume" into pi-dev