Merge "Shorten the timeout of finish call to 10 seconds" into sc-v2-dev