Fix some suspicious cluster moves

[TheJulianJES]

Proposed change

Tries to fix some of the quirk issues discovered with #4259

Additional information

See #4259

Device diagnostics

I wish.

Checklist

• The changes are tested and work correctly
• pre-commit checks pass / the code has been formatted using Black
• Tests have been added to verify that the new code works
• Device diagnostics data has been attached

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 92.05%. Comparing base (a5c5914) to head (92b033a).

Additional details and impacted files

@@           Coverage Diff           @@
##              dev    #4261   +/-   ##
=======================================
  Coverage   92.05%   92.05%           
=======================================
  Files         350      350           
  Lines       11601    11603    +2     
=======================================
+ Hits        10679    10681    +2     
  Misses        922      922           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.