Merge "Remove setting of SearchInputWidget configs to already-default values"