Merge pull request #5841 from leoetlino/correct-error IOS: Fix the error code for ES_DEVICE_ID_MISMATCH
