* commit 'abba15b5787ce986d3b453f63f87b71881854bea': Fixed several bugs regarding the state of the notifications