Revert "Revert "Volume wake: move to display settings""

This reverts commit 2b655b53efbfce368b5bbc044b11567d20cc9297.
Revert "Revert "move volume rocker music control and default stream type""

This reverts commit 7782cc3fabd6b6ce30b84b0071c5d26a21c6e8f5.

Conflicts:

	res/xml/mahdi_sound_settings.xml