SM-2286: Fix Await trait logic to actually check again after the final wait

(Cherry picked from the revision 787232f7f777d16e639b58cb5f5f1339399002c5)