Merge pull request #8791 from benjamincongdon/Twitch-AudioOnly-Rebased