Merge "Ensure correct width and height are used during popup positioning" into nyc-dev