Bug 938707 - Fix failure of test_settings_do_not_track
Merge pull request #13831 from AndreiH/fix_dnt_v1.2

Bug 938707 - Fix failure of test_settings_do_not_track