Merge "Fix logic in fallback ringtone handling" into klp-dev