am 4606d5dd: Merge "fix uninitialized variable in DisplayHardware" into kraken