Revert "Revert "Move 'Swap volume buttons' option to 'Buttons' menu""

This reverts commit 6b60c476b74332093d00fde415ea595145f7565b.