Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-dev