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

Change-Id: Ibc2f822d2b3a8f274900bf173e38f0bd7e92dfa8