Merge "Update device to use set_prop() macro"