Merge "2D Recents: Fix a glitch during task relayout after a dismiss" into nyc-mr2-dev