Merge "[Settings] Avoid from dialog disappear when click outside" into sc-v2-dev