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

* commit '8924f23d3ecdcb2b1ce4dbc9bb4fbb9ddfa62710':
  Fix SysUI crashes on svelte devices