Merge "Fix FingerprintManager NPE" into main