I have committed the diff for 2.53.1 to -current without adding the
flavor so that we can backport that if needed. However, I didn't see
anything security related in the change log, so I did not do that.

I'm pretty sure we should not add a new flavor to -stable.

If you want the upnp flavor in -current, please resend the diff, but
that will need a proper ok.