Merge "Clear notification count to handle different flows" into oc-dr1-dev am: b0f192f654
am: 256b74bccd

Change-Id: Ib1b8cb68a980a9c65311be6481c506af76fad42a