Merge "Add new touch and notification vibration intensity settings."