am e46094c4: am 84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev

* commit 'e46094c4388412f996292af73acb0b9fda99ffcd':
  Use hint text to position handle / floating tool bar popups