Merge "Fix bug 6558006: SystemUI native heap is huge. Fix memory leak" into jb-dev