Merge "Add SfpsRestToUnlockFeature to FingerprintFeatureProvider" into main