Merge "Update device icon tests" into main