Merge "2D Recents: use correct layout logic for drawing transition headers" into nyc-mr2-dev