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

Change-Id: I7922a18d5ff0f9d5c2e880dd3328216458772303