Always load preview when in preview mode, not in edit mode
Merge pull request #2091 from robert-h-curry/cms-preview-not-loading

Always load preview when in preview mode, not in edit mode