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