Merge "Add a separated flag for Volume Panel large screen" into main