Merge "Ignoring alpha jumps in ArrowTipView" into udc-qpr-dev