am 45b04c1a: am 47ea8b3d: Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev

* commit '45b04c1a5ef4f21b14b40dd0c1035933188da322':
  DO NOT MERGE: Update floatingtoolbar position when cursor moves.