Merge "Fix crashes during density changes" into nyc-dev