Merge "Add codename to device name file for layoutlib overlays" into main