Merge "Remove device name and display debug setting"