Merge "Pipe through featureId from calling context to wifi location checking code"