Merge "Fixed an issue where the wrong notification would be heads upped" into pi-dev am: fbdd1f7d09
am: 78e030e1f6

Change-Id: If22dc6f1957d2e8c8ca334b25e6523c32b5053ed