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

Change-Id: I97a5f603ed5c220736b45a6c96fe3a6477608e84