Merge "Expose Location toggling logic" into oc-dr1-dev