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