Merge branch 'next-demonic'
Only show transcoding message for on-demand video
Merge branch 'master' into squares