Merge back new device properties material for v4.7.