CMS-1363: Live Edit - Fix reloading of "live view" on every toggle