Merge "Prevent taskbar reset animation from playing when gesture is in progress." into main