Merge "Revert "Relaunch activity resumed if it got resumed before relaunching.""