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

Change-Id: I007934cfb8bd971e77291a56958fb55e1bfc5c3e