Merge "Don't expect another task to become focused when dismissing Desktop task" into main