Merge "Prevent left_block_mode stepping into left tile"