Merge "Update the Warning text about the visibility of device name." into rvc-qpr-dev