Merge "Fixes showing learn more screen from fingerprint intro page" into nyc-dev