Merge "Fixed focus state cropping in last shortcut" into main