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

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

Change-Id: I5b7b0159a8b15f5ace07b886d83993afe09e1855