Merge "Update Picker Settings UI test" into tm-mainline-prod