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

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

Change-Id: Ie7e49704c08e3ba0630f3bf0f52b34fec5d6451d