Merge "Finish recents if it was not in transition when merging" into main