Merge "Optimize rect-shaped layers."