Merge "Preserve PIN_NOT_SET state when reactivating on VVM3" into nyc-mr2-dev