Merge "Fixing tiles scrolling with arrow keys" into main