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

Change-Id: I918a93373260e02d3b5157a65d3c23b0f552d30c