Merge "Replace RequiresFlagsEnabled and RequiresFlagsDisabled" into main