Merge "Dynamic density change handling" into nyc-dev