Merge "Add new category key for More Settings page"