Merge "Add tests for require unlock for NFC" into sc-dev