Merge "Null-check notif chan when ident people notifs" into rvc-dev am: b687bc21 am: 17f8c329 am: 82ac88a8 am: f11d1535 Change-Id: Iece50026ee7d7ec8a10a2b070add3bc459ea4507