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

Change-Id: I21a0c14b5b02a7d3905aa1465cfbd05f308f620c