Merge "Fix message router config for UUI"