Merge "Clear notification count to handle different flows" into oc-dev