Add timeout for payment setup (bug 876811)