Merge "Allow fingerprint fallback from any state." into sc-dev