Merge "Add missing required permissions for Settings" into main