Merge "String update to better reflect the user action to enter device" into main