Merge "Rename DensityMap to DensityMapping per API review" into tm-dev