The locking around InvokeCommand is still not great

As regressed in #518 

We probably shouldn't just allow one command to be performed at a time. Instead we should probably just keep the task for the last one, and cancel the previous one, and then not handle the result of the previous one. The way it is now is wacky. 