Core layout changes in preparation for animations