Merge "Remove unused intent in NiNotification" into pi-dev