Merge "when test case times out, stop loading first" into honeycomb