Merge "Ringer toggle always affects system sounds"