Merge "[Notif] Blocking helper basic metrics" into pi-dev