am f3d505af: Merge "Bug 5383077: handle video thumbnail generation correctly when effects are on" into ics-mr0

* commit 'f3d505afe66e0961e904027e8ab98455ccd3bd2e':
  Bug 5383077: handle video thumbnail generation correctly when effects are on