Merge "Change default IFingerprint HAL back to STRONG" into sc-dev