Merge "Fix leak in LayoutTransition" into ics-mr1