Merge "Fix stuck notifications" into pi-dev