Merge "Increase timeout of Open Baton installation"