Merge "Keep the desks order inside overview by its deskId" into main