Merge "Change location settings icons from crosshair to pin -b/8142654" into klp-dev