Split isLive and isDVR into different control sets.
Merge branch 'hotfix/0.8.3'