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

Change-Id: I5837867b32182e468b47ca5d9a7544dfb7e52211