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

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

Change-Id: Ib1c38958d87e70a7700f11521732774f4d4b21ff