Merge "Better organize media recorder error and information event and types"