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