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