Merge "Fix mismatched state between SystemUI and FingerprintService" into sc-v2-dev