Merge "Better FloatingToolbar positioning." into mnc-dev