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

Change-Id: Ifeedd6de1af0f618494ae89c09bff94d10458243