Merge "Fix GpsLocationProvider.enable/disable/isEnabled"