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

* commit '47ea8b3d6bcef193a2d0ec9f0141525c83a0bcda':
  DO NOT MERGE: Update floatingtoolbar position when cursor moves.