Merge "Add Volume Controller API usage flag: use_volume_controller" into main