Merge "Fixing crash in video capture intent with effects on" into ics-mr0