Stale plan race condition on main pipeline after merge with scheduled pipeline

With the introduction of using approved plans in the main pipeline and while also using drift detection in the scheduled pipeline, it seems that we risk a stale plan with the following order of pipeline executions:

• MR merge train plan gets created
• MR is merged
• drift detection runs and updates states (computed fields, etc)
• main pipeline fetches approved plan and fails.