Merge branch 'Kagami-vlive-hls'