Merge "Adapt transition merge during recents into onTaskAppeared." into sc-dev