fix for TF on FF: js is not evaluated after the wait timeout
@rev gtorres@
@bug W-2354829@
Merging origin/lin/master-pending/TF-W-2354829 into master