Merge "Improve messaging when user disables location"