LPS-52174 Make sure we use a viewable layout in the theme display when falling back to a default to avoid infinite redirects