Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev am: 42d4a337a3
am: 22ff8d0779

* commit '22ff8d07796a9fc382bc364bae490dec9d258ec5':
  Only resuming starting dontWaitForPause activity once

Change-Id: Idd556009a345aee1b7166934aaccfbd4c2e1787f