Merge "Fix fault handler to unregister on shutdown"