Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."