Merge "Fix test breakage in settingslib"