Merge "Fix regression with docking from recents transition am: 363ab98 am: e645659" into nyc-mr1-dev-plus-aosp
am: d40eade

* commit 'd40eadeab90e5d182038ad5299c235d451e434a4':

Change-Id: Iad0af0f9bd2f1c7486de6e804bb23b4cd29181e7