Merge "Clear deferRelaunchUntilPaused flag after activity relaunch is performed" into nyc-dev
am: c3af194

* commit 'c3af194138f3df8a81a244e041da98097427b4d2':
  Clear deferRelaunchUntilPaused flag after activity relaunch is performed

Change-Id: Ifef6283d29d88b524c62acbae6a66a63024b9684