Merge "Add uid to PendingStartActivityUids when activity resumed." into rvc-dev