Bug 1040063 - [v2.1][v2.0] Intermittent test_settings_do_not_track.py failure
Merge pull request #22629 from viorelaioia/bug-1040063

Bug 1040063 - [v2.1][v2.0] Intermittent test_settings_do_not_track.py fa...