Merge "[flexiglass] Adds flag refactor wrappers." into main