Merge "Introduce insets decoupled configuration feature flag" into main