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

Change-Id: I1753b00beb6fbcb7b7e5273e4d371b3609acd310