Merge "Refactor DeviceInfo in HWUI"