Merge "Update mKeyIsWaitingForEventsTimeout separately from the prune check" into main