Merge "Separate out animations from layout."