Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro.""