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