Merge "Fingerprint should check current client when task stack changes" into pi-dev