Merge "Independent keyboard vibration settings" into main