Merge "Add setter/getter to disable VCN safe mode" into main