Merge "Increase timeout for sdc-merge"