Merge "DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps" into qt-dev