Merge "Avoid showing the disambiguation dialog"