Merge "Merge "Fix Possible Deadlock with getFeatureState" am: 6bebb8418c am: 057f582e09 am: 9296dcff69"