Merge "Send notification state event more frequently" into oc-dev am: 13cbd65608
am: fb938ee79f

Change-Id: Iaa841201651eb90c691512c3919d38272e0d2a4c