Merge "Fix crashes during density changes" into nyc-dev
am: 93a075ecdd

* commit '93a075ecdd40fb9ecf656316add05966ddc36b96':
  Fix crashes during density changes