Make sure closing overlay kills videos
Merge branch 'master' into staging