Merge "Remove Disco video from builds." into jb-dev