Merge "Clear notification count to handle different flows" into oc-dev am: fae2852b2b
am: d50d573be9

Change-Id: Ic427c48471a0128a35d5f3c9b67f2d6e520681d7