Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev