Laura Fitzgerald The issue is still there. It has not been automatically resolved by the previous fix because of this code: it changes the value of a component property. That should be avoided and state change should be performed instead. To easy resolve the issue, something like this could be added:

    if (!hasUPSAndroidAnnotation && !hasUPSIOSAnnotation) {

        if (schema.properties.CLIENT_TYPE) {

          schema.properties.CLIENT_TYPE.default = 'Android';

          schema.properties.CLIENT_TYPE.enum = ['Android', 'IOS'];

        }

      }