Make sure subtitle-button disappears when switching to live streaming
Merge branch 'master' into squares