Merge branch 'master' into playback
Permanent playback view in lower region of the viewport
Merge branch 'playback'