Merge "Support using USB keyboard to update device name" into main