Merge "Make sure finishSession logs the final status" into main