Merge "Clear deferRelaunchUntilPaused flag after activity relaunch is performed" into nyc-dev
am: c3af1941
* commit 'c3af1941':
Clear deferRelaunchUntilPaused flag after activity relaunch is performed
Change-Id: Ifef6283d29d88b524c62acbae6a66a63024b9684