Merge "Work on issue #77931346: The notification that should not be named appeared" into pi-dev
am: 12f404e3e3

Change-Id: I19f5b0cbafed7234e96edd0793413b37cd0a14a7