Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev