Merge "Defer removal of relaunching activity window due to config change."