Merge "Update the device twoPanelId specs to use the default spec when it is not defined" into main