Merge "Fixed several bugs regarding the state of the notifications"