Fix and simplify More Music Volume Steps option
Merge branch 'kitkat' of https://github.com/GravityBox/GravityBox.git into kitkat