Merge "Dramatically simplify NotificationRankingUpdate." into qt-dev