Merge "Insert the 2 seconds before test start to workaround the race conditon for requesting the surface."