Make sure the preview rendering resolves. Fixes #2069.
Merge branch 'master' into jquery-ui