Merge "Move rename button next to the device name" into main