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

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