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