Update the Composite Mapper to reflect changing in Edge Rendering

Change-Id: I27a4b2149ed825e4e017a12291b9be875afbba67
Merge topic 'fix_edge_vis_on_composite' into master

15753f92 Update the Composite Mapper to reflect changing in Edge Rendering