Merge "Ensure that popup width and height are correct on update" into nyc-dev