Merge "Fix sysui crashlooping"