Merge "ignore rootlayer when drawing (fixes regression) dump layers contents in displayTree.txt"