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

Change-Id: I2170738ea246f16c010876af49ec8fd818955582