Merge "Fixing regression in stack task clipping."