Merge "Fix Floating toolbar overflow width." into mnc-dev