I think it would be safer to wait for something that will always be there. I know I have had to go back into a number of tests and add waits to them, even when the tests were passing fine on my phone. It will save a step to just do it now, imo.