Merge "Adjust the timeout for TraceurUiTests"