Merge "[Settings] Avoid from dialog disappear when click outside"