Merge "Fix getConfigureGeoDetectionEnabledCapability()"