Merge "Increase timeout for WaitCondition test"