Merge "Use default icon if package name is null" into main