Merge "Streamline SystemUI proguard flags"