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

* commit '2ac717ed82368e96c8cb46fba3da0ca26895c450':

Change-Id: Ie0160ccb414b93e10ddd2bdaae6e03690dcff132