Merge "Fixed an issue where a notification could become empty" into pi-dev