Merge "Remove unreferenced assets from SystemUI." into klp-dev