SIO-1323 Logo handling improvements

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