Merge "[Bug Fix] "Dock defend string and tips in settings are incorrectly" issue" into main