Merge "Fix drag to add tiles showing too many times" into nyc-dev