Merge "Rewrite popup window positioning algorithm" into nyc-dev