Merge "[UUI] Uui-intent-analysis resource settings fix"