Merge "Move Configuration compat feature flag to app compat namespace" into main