Merge "Fix leak on density change." into nyc-dev