Merge "New icons that eliminate location "crosshair" -b/8142654" into klp-dev