Merge "Simplify getting/setting class of device"