Merge "WebInstallerOptions: Preserve state of extension checkboxes on error"