Merge "Null-check notif chan when ident people notifs" into rvc-dev am: b687bc21e1

Change-Id: Ib5bd54217d404b634503ac04820abe3a8edd8f3e