Merge "Revert^2 "Strip verbose logs in SystemUI""