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