Add timeout to WaitForOneFromTask

We should never wait forever for anything.

Change-Id: Icaa61febbf4745206abbe5bf9255c9401f341e71
Merge "Add timeout to WaitForOneFromTask"