Merge "OPP: Check whether notifier is intialized before cancelling notification" into q-keystone-qcom-dev