LPS-31897 When generating URLs, If there is no controlPanelCategory set we should preserve the controlPanelCategory parameter only if the parameter is in the request and not in themeDisplay