Revert "Separate Live volume steps into separate menu and class"

This reverts commit cbfe4011bf44f1b7ada11420529ae1b9d3f4e917.

Change-Id: I4a5f270332cc2ec279c92fdfbedff6d87cd893f2
Merge "Revert "Separate Live volume steps into separate menu and class"" into kitkat