Merge "Fix a crash when trying to find fingerprint sensor"