Merge "Fix flags linking for SystemUI" into main