Proposing to backport with minor change: do not disable live-preview (it's currently disabled in trunk, why?).
Proposing to backport with minor change: do not disable live-preview (it's currently disabled in trunk, why?).