Merge "Use VOLUME_SETTINGS_INT instead of VOLUME_SETTINGS"