Merge "[Notif] Show block message for notif with multiple channels" into pi-dev