Merge "Fix snapshots for secure windows" into oc-dev