Merge "More snazzy animation for UX happiness." into nyc-dev