Merge "Fix logo res not found with systemui context" into main