Fix preset theme + custom policy override precedence#2408

broody merged 1 commit intomaincartridge-gg/controller:mainfrom

fix/preset-theme-custom-policies-overridecartridge-gg/controller:fix/preset-theme-custom-policies-overrideCopy head branch name to clipboard