Merge "Improve relaunch merging in activity thread."