Merge "Fix issue #77931346: The notification that should not be named appeared" into pi-dev am: 98d2d895b5
am: f482546c10

Change-Id: I756e5fed1ccf6ac1f93d7f0bddc74b8f7e541724