Merge "Improve SF dumpsys output wrt HWC"