Merge "Fix references to resources using incorrect packages in SystemUI-core" into main