Merge "Simplify haptic-only ringtone logic" into main