Merge "Fix region sampling for secure layers" into main