Make tests wait correctly for Drawing to complete.
am: b31fd04989

Change-Id: I1f1b5efbbbcd545c4617b70368df2229be3cbab9