Issue #18833: Happy path for changing layout is working