Merge "DefaultLayoutAnimations should use GridLayout instead."