Merge "Restore the density when it has been overridden" into tm-d1-dev