Merge "Add metrics category for more settings fragment" into main