Merge "Set tooltip color scheme to match app scheme" into main