Merge "Fixed flicker when docking task from recents." into nyc-dev