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

* commit 'bc0a5cb2f8b5cac550196b535d91e07bb586f647':
  Fixed flicker when docking task from recents.

Change-Id: I706798a9561613033af637473bf98b8fb72a8ca4