Merge "Switch volume animation to Scene." into nyc-mr1-dev
am: ba8f3d03ac

Change-Id: I50f8e255809f68385b839d3b8f9caaa7e61e3d6e