Revert "move volume rocker music control and default stream type"

This reverts commit 9fed036346c8e3014e48f49b737393b60dc2bd0c.
Revert "Volume wake: move to display settings"

This reverts commit fface3f968c605a35728eac9cdab2579dc41a1c6.