Bug 1085359 - Move secondLayout option handling to render +shepherd

The `uppercase` flag is re-purposed to tell the render the current state. It's probably always `false`.