Merge "Fix NPE when setting new LayoutTransition" into klp-dev