LPS-44575 Remove deprecated method call from other places

Hi Jorge,

so I created the short-term refactoring of ThemeDisplay to avoid the possible regression 64c037bc8159fc60516fdbafbd0043d91f7cb425 as we discussed on Skype.

But we need again to change tests. @mdelapenya is it better to revert the tests or make some clever change to the existing test?

Thank you!