Merge "Add build timeout for controller"