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

Change-Id: Idb4a63179669ff811f6e7239c0ba31011bd6c783