Merge "Rework Volume Panel visibility changes to always show only one panel" into main