Merge "[flexiglass] Disabled content support." into main