Merge "Refactor Settings for injection v2 inline toggle"