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

Change-Id: I10d527a237fa2c47d6bef193de8aa194f391c74b