Merge "Increase timeouts for loopers"