Merge "Ensure log buffers are dumped to file on uncaught exceptions" into tm-dev