Merge "2D Recents: fix toggling behavior" into nyc-mr2-dev