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

Change-Id: I99e41bc1cdd3a25e4884ba7ed7e77ab6bd7cf14e