Merge "Fix EffectsRecorder error path handling when ending recording." into ics-mr1