Fix Draft: being added too much

What does this MR do and why?

For #388148 (closed).

Revert !109016 (merged) has failed to merge a few times.

While a pipeline is running again, this MR fixes this issue without a revert.

Please see the commit description of why/how.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

• I have evaluated the MR acceptance checklist for this MR.