Don't get stuck in deployed mode because of an impossible move order

OpenRA.Mods.Common/Activities/Move/Move.cs

@@ -142,6 +142,9 @@ namespace OpenRA.Mods.Common.Activities
 
 		public override Activity Tick(Actor self)
 		{
+			if (IsCanceled)
+				return NextActivity;
+
 			if (moveDisablers.Any(d => d.MoveDisabled(self)))
 				return this;
 

OpenRA.Mods.Common/Traits/Upgrades/DeployToUpgrade.cs

@@ -95,7 +95,7 @@ namespace OpenRA.Mods.Common.Traits
 			if (isUpgraded)
 			{
 				// Play undeploy animation and after that revoke the upgrades
-				self.QueueActivity(new CallFunc(() =>
+				self.QueueActivity(false, new CallFunc(() =>
 				{
 					if (!string.IsNullOrEmpty(info.UndeploySound))
 						Sound.Play(info.UndeploySound, self.CenterPosition);