Merge "Separate finishTransaction for leftover transition" into main