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

Change-Id: I5ab9255027b10da3e6ad540d96a3542b1a5140f2