Merge "Remove SetFlagsRule.setFlagDefault and usages; this is no longer required" into main