Added waits

Summary:

Test Plan: psyduck

Reviewers: adam, alex, anders, ankur, mandrews, marko, nika, nikita, pieguy, rob, kouprin, mikhail, jiajia, francisco, rodrigo, sorawit, linh, rumen, cheng, payut, georgi, yordan, marin, raj, jack, joseph

CC: engineering

Maniphest Tasks: