SIO-1323 Logo handling improvements

Change-Id: I0a727ce2e0aa971e51ee6284e4c688df7cef7ff0
Merge "SIO-1323 Logo handling improvements"