Merge "Add animation for expand/collapse actions in editor"