Merge "Allow user builds to disable secure transport for testing." into main