FLUID-5131: surface subpanel selectors

Pulling up the rendering selectors from the subpanels to the combinedPanel. This is needed for the single pass rendering in the combinedPanel.