Merge "Reconcile logging of blocking helper and manual notification management."