Switching location listeners to listen directly to location client