Merge "Fix Possible Deadlock with getFeatureState"