Merge "Temporarily allow StackView to use a canvas.clipRectUnion" into pi-dev
am: 7a7b2369fe

Change-Id: I537ec61d77a42d2d7ccca11cc3234cd0e18fbf27