Merge "Improve window manager layout attribute dumping"