Merge "move test_disable_at to simple_layout" into feature/zuulv3