Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev