Merge "Further decouple layout and animation."