Merge "Respect caller config to disable VCN safe mode" into main