Merge "Charging sounds toggle now includes vibration"