Fix SystemUI memory leaks #2

Change-Id: Id249072d220553a777fa012cffa07cf0b18ca5e2