Merge "Clean up popup window positioning" into nyc-dev