Merge "Fix webkit flakiness when waiting for results" into honeycomb-mr1