Merge "Animate volume dialog expansion/contraction." into nyc-dev am: e86ac2f
am: 460f707

* commit '460f707e152a8204b14f3ffcb35330aeadc3a4e7':

Change-Id: I06f35e3b66bd30f1cd3363886506ea16084006e3