Merge "Use Fingerprint/FaceManager from injector"