Cleaned up the updating of notifications

Some states were not correctly updated which could lead to
small bugs when the update was not in-place.

Change-Id: If133029acf65a9af8d297314fee5f1cd9e2015bd