Merge "Remove FlagManager's dependence on librenderengine" into main