Merge "Fix SysUI crashes on svelte devices" into mnc-dev