Merge "Check fingerprint client against top activity in auth callback"