Merge "Fix popup dialog show wrong device name"