Merge "AOD: Finish pulse when notification is removed" into oc-dr1-dev