Merge "Fix leak in TransitionInflater" into klp-dev