Merge "Fix bug when the hover icon is on the edges, it continues to have the hover icon inside the task bounds." into main