SystemUI: code cleanup

Change-Id: Ie7d5be23b15263d616a945740240b913be016732