Merge "Handle MediaRecorder stop exception for effects recording" into ics-mr0