Merge "Update FloatingToolbar overflow button." into nyc-dev