Merge "Fix NPE when updating rankings for pending notifs"