Merge "Add keyboard vibration settings" into main