am 3f9a851e: am ed2c5133: Merge "Bug fix: 3419287 Deleted images and video clips invalidate the entire project" into honeycomb

* commit '3f9a851e07f0fbe0f5440afd82f26b52ca79428e':
  Bug fix: 3419287 Deleted images and video clips invalidate the entire project