Merge "Fixing crash when dumping secondary SystemUI user service." into nyc-dev