CMS-2428 LIve Edit - Fix bugs with selecting/deselecting images