Merge changes from topic "fix-tiling" into main

* changes:
  Refactor DesktopTestHelpers
  Always reorder surfaces on focus change