Merge "Fix private volume UI items incorrectly displayed for public volume" into main