Merge "Revert "Allow admin flags to be used in PermissionController"" into main