am 0d8f88b2: am ede54ce2: Merge "Fix crash in movie studio." into honeycomb

* commit '0d8f88b272f80f2a3594d2d988faabed4e540631':
  Fix crash in movie studio.