Merge "Use Thread.dispatchUncaughtException() rather than duplicating logic."