Merge "[Notif] Remove old blocking helper button" into pi-dev