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

Change-Id: I0ab37bd7b5cf4b00df4dc70d35a1387e3f348680