Merge "Changing the name densityMap->densityMapping due to framework changes" into tm-dev