Bug 938707 - Fix failure of test_settings_do_not_track

The locators changed, but I also took the opportunity to replace the `sleep`s with actual waits.