Merge "Null-check notif chan when ident people notifs" into rvc-dev am: b687bc21 am: 17f8c329 am: 82ac88a8 Change-Id: Iad595dcd48f8b7e24951968f1e09de72496c408f