Merge "Update dependent properties when deviceType is updated" into main