Merge "Bugreport: Fix SystemUI service from being dumped twice 2/2"