Improve SystemUI restart