Merge "Delay possible re-entrant call to updateNotificationViews()" into qt-dev am: bce828f1 am: b2b70838 am: 7a121090 Change-Id: Ifeedd6de1af0f618494ae89c09bff94d10458243