Merge "Revert "Add telephony feature flag lib"" into main