Merge "Do not collect activity in finishTransition" into main