Merge "User education support on disambiguation dialog" into qt-dev am: 327751f18f
am: 0d2970d912

Change-Id: I0f767ad91d0eaa7c11c14e752ba93a5c04e8cdce