Merge pull request #5943 from leoetlino/features IOS: Check for available features when adding devices
