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

Change-Id: I93191bfb1d833134d8afd826c18b0310c7e9c46c