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

Change-Id: I664be0dd3e1f2e6cf2d7dc94613b0efcaf6887a9