Merge "Setup Volume Panel infra" into main