Merge "Fix flag namespace for secure_array_zeroization" into main