CMS-3968 Live Edit - Context window looses initial mode - final fixes?
fix for default behavior
Merge remote-tracking branch 'origin/master'