am 2fa861cc: am 261ddb81: Merge "Fix issue 3408285 Crash while generating KenBurns" into honeycomb

* commit '2fa861cc6ef65696854dc4a85494bea6dd87fd8e':
  Fix issue 3408285 Crash while generating KenBurns