Merge "Location overlay refactoring 1/3"