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

Change-Id: If71e6fce739d92925bc18be6454f8cb5f60a992a