Bug 1085359 - Move secondLayout option handling to render +shepherd