Merge "Adjust bounds of a task moving to another display" into main