Merge "Merge "Fixed flicker when docking task from recents." into nyc-dev am: bc0a5cb2f8 am: 342065cc95" into nyc-mr1-dev-plus-aosp
am: 9ab9573a22

* commit '9ab9573a2235bc231988c62155040517bbd0b6e8':

Change-Id: I27081d889dd02fcb1a0c13cc781ca5ab2613bbe9