Merge change 23450 into eclair

* changes:
  At leaset log the layout test timeouts