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