Merge "Temporarily allow StackView to use a canvas.clipRectUnion" into pi-dev