Merge "User education support on disambiguation dialog" into qt-dev