Merge "Fixed a few memory leaks in SystemUI" into nyc-dev