Merge "Extract and unhide TransitionListenerAdapter"