The overlay does not make the canvas flicker anymore.
Merge branch 'master' into dropbox