Merge "Use updateCecDevice to update existing deviceInfo" into main