Merge "Don't unnecessarily set LayoutParams on children"