Merge "Clear notification count to handle different flows" into oc-dev am: fae2852b2b am: 7ab2da1243
am: 0d7937ae51

Change-Id: I0c724ca7a2a967d00495fe3342bb293c35b03631