Merge "Null-check notif chan when ident people notifs" into rvc-dev am: b687bc21 am: 208e943b am: a3e393ba am: 9ccc184f Change-Id: If395bcda33d12a858b3747555992ff9fc4a1f886