Bug 938707 - Fix failure of test_settings_do_not_track
Merge pull request #13718 from bobsilverberg/fix_dnt

Bug 938707 - Fix failure of test_settings_do_not_track