[ot-layout] Narrow down random feature logic vs safe-to-break
2 files changed