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

...ll the transitions and wait for it.