Merge "Ensure FloatingToolbar is not rendered at negative x, y coordinates." into nyc-dev