am e58ba842: am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev

* commit 'e58ba842de4324c62b7e527f0b90fc6ee5ccba13':
  Fix SysUI crashes on svelte devices