Fix "flicker" when previewing lessons
Merge commit 'e9c1f25' into development