Merge "Refactor SettingsLib for injection v2 inline toggle"