Merge "Ensure that transitions animating alpha end on a reasonable value" into klp-dev