Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-qpr1-dev