Merge "Move animation step from layout to animator."