Merge "Notify display is empty even if it's not the expanded bubble" into qt-qpr1-dev
am: 4cb4e0a189

Change-Id: Ief800786618c2d248e9260be54ce874b4476e959