Merge "Optimize layer traversal"