Move enabling of USB charging from sound_settings_apply to settings_apply