Merge "Block non-sysui targets from including internal sysui flags." into main