Bug 1095825 - instead of checking settings app right away, account for all the transitions and wait for it.
Merge pull request #26072 from yzen/bug-1095825

Bug 1095825 - instead of checking settings app right away, account for a...