Merge "Additional location logging" into sc-v2-dev