Merge "[SO][UUI] Adjust resource settings"