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

Change-Id: If395bcda33d12a858b3747555992ff9fc4a1f886