Merge "Make fading transitions work better" into klp-dev