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

Change-Id: I1510f3e1d6a7c1a1149e917dfd55b3a634e91aec