am 8b575ec3: am c05c3628: Merge "Ensure that transitions animating alpha end on a reasonable value" into klp-dev

* commit '8b575ec3a733d5e08b0fc9ce995d2aa2148f47a6':
  Ensure that transitions animating alpha end on a reasonable value