Merge change 24931 into eclair

* changes:
  Fix the bogus crashes in layout and reliability tests (the device actually went offline).