Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev