Merge "Add audio category preference in more settings fragment" into main