Merge "Add missing endRecording calls"