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

Change-Id: I322f738ff99b811f4796e4f331ca440694685f2d