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