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

Change-Id: Ifc0af142f39455515f29023fce04e8ccfbcc9597