Merge "Merge "Workaround that Recents is shown again after an activity is...
Merge "Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev am: 174aa334 am: 3f41684d" into nyc-mr1-dev-plus-aosp
am: 7cafe32d
* commit '7cafe32d':
Change-Id: I421ecc947102d684c2318ca106b9ff55e861a289