Merge "Add new device entry icon state "None"" into main