no need to use generate_toggle_id explicitly
minor refactor
update toggle submodule
Merge pull request #3923 from dimagi/toggle

Toggle tweaks