Merge "When applying a RankingMap that lacks an entry, remove that entry from the NotifCollection." into tm-qpr-dev