Merge "Fix HUN unbind crash when notif is removed." into rvc-dev am: 80057e3a35 am: ca42ac2a0b am: a107190297 am: 7e244229a0

Change-Id: I1d43002ed012959a0fd3b1831b431fdc410311c3