Merge "Reset tooltip preference to fix flaky test." into sc-dev