Merge "User education support on disambiguation dialog" into qt-dev am: 327751f18f am: 0d2970d912
am: c64996bb69
Change-Id: I1099fdb75ca4dbaaf6aafb14cc4862fba7853a4e
This commit is contained in: