Merge "Revert "Inject ActivityStarter into ToggleSeekBar"" into main