Merge "Animate volume dialog expansion/contraction." into nyc-dev