Merge "Fixing a memory leak with notifications" into pi-dev