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