Merge "Do not translate the AddDesktopButton on dismissing a TaskView" into main