Merge "Dramatically simplify NotificationRankingUpdate." into qt-dev am: d4d9b233b2
am: 1421c7395c

Change-Id: Icb87542e501611887e0db1080cd591a54a9dd53c