Merge "Fixed that notifications could still get stuck" into qt-dev
am: 13015d24f8

Change-Id: I54f0dad7ce7c2d1383eb9e7dfe70cce32273911c