Merge "Should not clean mRemote when finishing latest merged transition" into main