Merge "Remove unused intent in NiNotification" into oc-mr1-dev