Merge "Fix artifact with concurrent add/remove LayoutTransitions"