Bug 923355 - wait for setting to be set after switching dnt toggle

Uplifting to `v1.2`