Merge "Add overlay for fingerprint help URL" into mm6.0