Merge "Clear Gatekeeper state before a new enrollment" into oc-dev