Merge "Refine output of "dumpsys window displays/windows"" into sc-dev