Merge "Do stack  collapse after stack reorder" into tm-dev