Merge "Add persistent logging in case an exception kills Dispatcher thread"