Merge "Fix a couple leaks in SystemUI"