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

* commit 'f943b6def746217db06fc7c33e4d181fc55b87be':
  update video playlists and marquee announcements