Merge "Don't crash apps on notification error" into pi-dev