Merge "DeviceState changes"