Merge "Delay possible re-entrant call to updateNotificationViews()" into qt-dev
am: bce828f157

Change-Id: Ia8cf73996aa49d286880ddd5c9f23b915346ad6a