Merge "Dynamic density change handling" into nyc-dev
am: ed01756

* commit 'ed017560009ad1fea924b1a7dea9689bc0b14a31':
  Dynamic density change handling

Change-Id: I436ea2f72f3df932e8ea03b9673e9f1ff2b900ae