Merge "Fix fault handler to unregister on shutdown" into lmp-dev