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

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

Change-Id: I6b1715f666f0085dc9b43f557493d16655bf0297