LPS-41331 Improve layout logo selection