Merge "[Notif] Use OK instead of DONE for blocking helper" into pi-dev