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

Change-Id: I0238bfc42dc36eb1cf98b14045e329cd410deba5