Merge "Increase the 'all' timeout because slow tests are included"