Merge "Update pixel pitch of devices" into main