Merge "Fix 5056699: GridLayout should maintain static indices for "gone" views."