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

* commit 'ede54ce2fe3252d4ab56b90de464b35a6920970d':
  Fix crash in movie studio.