Merge "Fix switch indentation to follow our audio style"