am 46f9223b: am 94a55df3: Merge "Fix failure to play pinned movies" into jb-dev

* commit '46f9223b994c50e44354566375da2ec95bebc04c':
  Fix failure to play pinned movies