Merge "Null-check notif chan when ident people notifs" into rvc-dev am: b687bc21 am: 208e943b am: ab5acc5d am: ddb0be08 Change-Id: Ie09429083ea191c24dec91957bb6468e7dcf4f72