[DF-291] Improve WaitControlBecomeVisible