Merge "Simplify range check for audio_mode_t (continued)"