Merge "Fix FloatingToolbar popup positioning." into nyc-dev