LPS-39188 ThemeSettings are not obtained right for layout revisions