Merge "Split ring and notification vibration settings"