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