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

Change-Id: I2dac3a13a63a3cb0e8096b49b7a562614dc44c5b