[[ Bug 12702 ]] make sure image editing finishes when switching cards
Merge remote-tracking branch 'ian/bugfix-12702' into bugfix-12702
Merge branch 'bugfix-12702' into release-6.6.3