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