Merge "Null-check notif chan when ident people notifs" into rvc-dev am: b687bc21e1

Change-Id: I69a2a687b7e974e5f0165d3d395378536ce65fa4