Merge "Relaunch activity resumed if it got resumed before relaunching." into nyc-dev