Merge "icnss2: Fix null-pointer derefrence while thermal unregister"