Merge "Update device entry fg icon to start with an empty state" into main