Merge "Fix leak on density change." into nyc-dev am: a31ac7ddfb
am: f584b1d96d

* commit 'f584b1d96d2d114d57f5c87e9c517b7929854d53':
  Fix leak on density change.

Change-Id: I268a0c2d4096ad7d28c31964c560da88be43b44a