Merge "Use transition-only alpha property for fading transitions" into klp-dev