CMS-3968
Live Edit - Context window looses initial mode - final fixes?
Merge pull request #937 from enonic/CMS-3968

CMS-3968