Merge "Delete keyboard_category_enabled flag (2/2)" into main