Merge "Fix bug with over-expanding split task tile" into main