SystemUI: code cleanup

Change-Id: I34dd96c5c92fffffcbab2f6f4a36814c7de855a6