Merge "Winscope: fix layer traversal"