Merge "Always call finished when merging with an ongoing recents transition" into udc-dev