Merge "Fix video capture intent preview alert for effects." into ics-mr1