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

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