Merge "Improved output for 'dumpsys window displays'"