Merge "Device state"