Merge "Properly filter alert window notifications" into pi-dev