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

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

Change-Id: I0c2cdc6d46a14c4788405cb3f9f7af09eeed85ea