Merge "[Notif] Use OK instead of DONE for blocking helper" into pi-dev am: 3dee3d19c2
am: c480082eff

Change-Id: I490f3ef807ae92c65a25560c8657e6b7ef35cadc