Merge "Reorder getFeatureState parameters to convention"