Merge "Move some uses of updateConfigLayout to simple_layout" into feature/zuulv3