Merge "Also refresh FloatingToolbar for "icon" menu item changes." into mnc-dev