Merge "[Notif] Update guts/blocking helper UI" into pi-dev