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

Change-Id: Iad595dcd48f8b7e24951968f1e09de72496c408f