Merge "Cancel manual animation if LauncherState changes during drag." into main