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

* commit 'bb6fcb0f4d2a694b0d9af472d7444c653592a99e':
  Handle MediaRecorder stop exception for effects recording