Merge "Prevent height change in default ringtone preferences."