Merge "Add zen panel to volume dialog again in tuner"