am ef586c12: (-s ours) am eaa44818: am 05a56db3: Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev
* commit 'ef586c12d1bd1ac69dc7a9dcbddb1ee9d596d361': DO NOT MERGE: Minor fixes to FloatingToolbar.
This commit is contained in: