Merge "Remove unused intent in NFW notification" into qt-dev