- Fixed issue for swap using move whereby a device could get
  stuck in a revert loop despite there being no image in the
  secondary slot