Merge "Keeping Launcher in overview UI if activity is restarting due to UI mode changes"