Merge "Animate show/hide updates"