Merge "2-D recents: fix toggling behavior and orientation changes."