Merge "Support icons in the FloatingToolbar" into mnc-dev