Merge "WebInstaller: Don't call getSoftwareLink()"