Merge "Fix leak with transitions when views get removed" into klp-dev